From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun, 3 Nov 2013 00:06:29 +0000 (-0400)
Subject: overviewControls: Fix bad expression causing incorrect thumbnails allocation
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3103
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ea2451d88265a7a0abac5ae81da26297ee5bfde4;p=gnome-shell.git

overviewControls: Fix bad expression causing incorrect thumbnails allocation

`a + b ? c : d` is parsed as `(a + b) ? c : d`, not the more intuitive
`a + (b ? c : d)`.

This was causing a bad slide animation and Clutter warnings when coming
out of the overview.
---

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 98480c84d..cfe89a54a 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -68,7 +68,7 @@ const SlideLayout = new Lang.Class({
 
         let actorBox = new Clutter.ActorBox();
         actorBox.x1 = box.x1 + alignX + this._translationX;
-        actorBox.x2 = actorBox.x1 + child.x_expand ? availWidth : natWidth;
+        actorBox.x2 = actorBox.x1 + (child.x_expand ? availWidth : natWidth);
         actorBox.y1 = box.y1;
         actorBox.y2 = actorBox.y1 + availHeight;